From 2d64dbf5eef2a62c56bb2e2681d61887abbe5590 Mon Sep 17 00:00:00 2001 From: "rac61@labyrinth.cl.cam.ac.uk" Date: Thu, 10 Jul 2003 12:30:31 +0000 Subject: [PATCH] bitkeeper revision 1.333 (3f0d5c67WCK8celxi8KUCjs_eFc8QA) Update web interface to work with new VBD interface. Finish tidying up web build files --- .rootkeys | 4 -- tools/control/README-web | 1 - tools/control/build-web.xml | 39 +--------------- tools/control/build.properties | 3 -- tools/control/docs/empty_dir | 0 tools/control/web/tmpl/makefile | 8 ++-- tools/control/web/tmpl/pd-gr.tmpl | 2 +- tools/control/web/tmpl/pd-rr.tmpl | 2 +- tools/control/web/tmpl/vd-par.tmpl | 2 +- tools/control/web/tmpl/vd-vbdcr.tmpl | 2 +- tools/control/web/tmpl/vd-vbdd.tmpl | 33 -------------- tools/control/web/tmpl/vd-vbdf.tmpl | 66 ---------------------------- tools/control/web/tmpl/vd-vbdfr.tmpl | 32 -------------- tools/control/web/tmpl/vd-vbdv.tmpl | 19 ++++++-- tools/control/web/tmpl/vd-vdcr.tmpl | 2 +- tools/control/web/tmpl/vd-vddr.tmpl | 2 +- tools/control/web/tmpl/vd-vdrr.tmpl | 2 +- tools/control/web/tmpl/vdmenu.tmpl | 6 --- 18 files changed, 28 insertions(+), 197 deletions(-) delete mode 100644 tools/control/docs/empty_dir delete mode 100644 tools/control/web/tmpl/vd-vbdd.tmpl delete mode 100644 tools/control/web/tmpl/vd-vbdf.tmpl delete mode 100644 tools/control/web/tmpl/vd-vbdfr.tmpl diff --git a/.rootkeys b/.rootkeys index e45e73bb1b..2240b77acc 100644 --- a/.rootkeys +++ b/.rootkeys @@ -11,7 +11,6 @@ 3eb781fceEYkUi1XHKf2V0KX7si2JA tools/control/build-cmdline.xml 3ec41f7cWCxQ8pdH8ZWqhhv-38qQ1w tools/control/build-web.xml 3ec41f7ca6IBXDSe0HVcMPp3PPloOQ tools/control/build.properties -3ec4ebe0g_MI1VqkbbyNB8gt6m0Adg tools/control/docs/empty_dir 3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/domctl.xml 3f042c35FzVap5QW0UBPnZ2ZM0l3QA tools/control/src/org/xenoserver/cmdline/CommandParser.java 3eb781fdNQvEJW3tNvovjqoN7GlePA tools/control/src/org/xenoserver/cmdline/Main.java @@ -105,9 +104,6 @@ 3ec41f7e1-bFRAfSveBhJNc-yQguXQ tools/control/web/tmpl/vd-pv.tmpl 3ec41f7e6v7MAKuV03qkOLX94vCGQg tools/control/web/tmpl/vd-vbdc.tmpl 3ec41f7eInaxQyoN0zPtGH6O1l0qaA tools/control/web/tmpl/vd-vbdcr.tmpl -3ec41f7e6vb1amZZa0IBdsPkPURj8Q tools/control/web/tmpl/vd-vbdd.tmpl -3ec41f7e678cIPHf9EjP5W6hVcssYA tools/control/web/tmpl/vd-vbdf.tmpl -3ec41f7e0PF1fM5WdSWxgtzcWTV__w tools/control/web/tmpl/vd-vbdfr.tmpl 3ec41f7eSe6rb0p4IxLU16czqIaTCA tools/control/web/tmpl/vd-vbdv.tmpl 3ec41f7eAYtNdK1Yy-RdGMCcSDNfBA tools/control/web/tmpl/vd-vdc.tmpl 3ec41f7eFxwTmuQ8wWMdvVQ5jtiKKA tools/control/web/tmpl/vd-vdcr.tmpl diff --git a/tools/control/README-web b/tools/control/README-web index f9cbe98bb9..a3c84ead65 100644 --- a/tools/control/README-web +++ b/tools/control/README-web @@ -39,7 +39,6 @@ to run: for development: ## edit xeno.bk/tools/control/build.properties # change manger.url to your xenoserver: mousetrap-0.xeno.cl.cam.ac.uk - # change build.home to your xeno.bk full path ## to "make install-web" in xeno.bk/tools/control instead of copying the war file cp $CATALINA_HOME/conf/tomcat-users.xml $CATALINA_HOME/conf/tomcat-users.orig sed -e 's//\ \ \ /' $CATALINA_HOME/conf/tomcat-users.orig > $CATALINA_HOME/conf/tomcat-users.xml diff --git a/tools/control/build-web.xml b/tools/control/build-web.xml index 1973eef888..2b9c91332d 100644 --- a/tools/control/build-web.xml +++ b/tools/control/build-web.xml @@ -109,14 +109,12 @@ --> - + - - @@ -308,24 +306,16 @@ The "dist" target creates a binary distribution of your application in a directory structure ready to be archived in a tar.gz or zip file. - Note that this target depends on two others: + Note that this target depends on: * "compile" so that the entire web application (including external dependencies) will have been assembled - * "javadoc" so that the application Javadocs will have been created - --> - - - - - - @@ -369,31 +359,6 @@ - - - - - - - - - - - - - - - - - - - -INCLUDE&vdmenu.tmpl - - -
- - - - - - -##WHITESPACE## ##GREYLINE1## ##WHITESPACE## - - - -
-Not currently implemented. -
- -
- - - - - diff --git a/tools/control/web/tmpl/vd-vbdf.tmpl b/tools/control/web/tmpl/vd-vbdf.tmpl deleted file mode 100644 index eb46b158d6..0000000000 --- a/tools/control/web/tmpl/vd-vbdf.tmpl +++ /dev/null @@ -1,66 +0,0 @@ -Flush Virtual Block Devices -SECTION&XenoServers -BREADCRUMB&Virtual Disk Manager&vd.jsp - - - - - - -INCLUDE&vdmenu.tmpl - - -
- -
- - - - - -##WHITESPACE## ##GREYLINE1## ##WHITESPACE## - - - - - - - - - - - -
- - - - - <% - for (Iterator i = root.vdm().getVirtualBlockDevices(); i.hasNext();) - { - VirtualBlockDevice vbd = (VirtualBlockDevice) i.next(); - VirtualDisk vd = vbd.getVirtualDisk(); - %> - - - - - - - <% - } - %> - - -
vd keydomvbdmode
<%= vd.getKey() %><%= vbd.getDomain() %><%= vbd.getVbdNum() %><%= vbd.getMode().toString() %>
-
Warning, this will remove all virtual block devices
- -
- - -
- - - - - diff --git a/tools/control/web/tmpl/vd-vbdfr.tmpl b/tools/control/web/tmpl/vd-vbdfr.tmpl deleted file mode 100644 index 0d172923bd..0000000000 --- a/tools/control/web/tmpl/vd-vbdfr.tmpl +++ /dev/null @@ -1,32 +0,0 @@ -Flush Virtual Block Devices -SECTION&XenoServers -BREADCRUMB&Virtual Disk Manager&vd.jsp - - - - - - -INCLUDE&vdmenu.tmpl - - -
- -Flush Virtual Block Device Results -
- - -<% - HttpServletRequestWrapper hsrw = new HttpServletRequestWrapper(request); -%> -output = <%= new CommandVbdFlush().execute() %> -<% - root.doFlushState(); -%> - -
- - - - - diff --git a/tools/control/web/tmpl/vd-vbdv.tmpl b/tools/control/web/tmpl/vd-vbdv.tmpl index 6a0a03947c..d9e0a0d9ea 100644 --- a/tools/control/web/tmpl/vd-vbdv.tmpl +++ b/tools/control/web/tmpl/vd-vbdv.tmpl @@ -9,16 +9,26 @@ BREADCRUMB&Virtual Disk Manager&vd.jsp INCLUDE&vdmenu.tmpl - +<% + CommandVbdList list = new CommandVbdList(); + String output = list.executeWeb(); + VirtualBlockDevice[] vbds = list.vbds(); + if (output != null) + { +%> +<%= output %> +<% + } else { +%> <% - for (Iterator i = root.vdm().getVirtualBlockDevices(); i.hasNext();) + for (int i=0;i @@ -33,6 +43,9 @@ INCLUDE&vdmenu.tmpl %>
domvbdmodevd keyvd name
+<% + } +%> diff --git a/tools/control/web/tmpl/vd-vdcr.tmpl b/tools/control/web/tmpl/vd-vdcr.tmpl index 9550407a1b..bb68cb7bed 100644 --- a/tools/control/web/tmpl/vd-vdcr.tmpl +++ b/tools/control/web/tmpl/vd-vdcr.tmpl @@ -64,7 +64,7 @@ Error: expiry time not specified.
expiry += System.currentTimeMillis(); %> output =
-<%= new CommandVdCreate( hsrw.getParameter("name"), Library.parseSize(size), new Date(expiry)).execute() %> +<%= new CommandVdCreate( hsrw.getParameter("name"), Library.parseSize(size), new Date(expiry)).executeWeb() %>
<% } diff --git a/tools/control/web/tmpl/vd-vddr.tmpl b/tools/control/web/tmpl/vd-vddr.tmpl index 355c111e81..c7926bad12 100644 --- a/tools/control/web/tmpl/vd-vddr.tmpl +++ b/tools/control/web/tmpl/vd-vddr.tmpl @@ -18,7 +18,7 @@ INCLUDE&vdmenu.tmpl vd= <%= hsrw.getParameter("vd") %> -vd= <%= new CommandVdDelete(hsrw.getParameter("vd")).execute() %> +vd= <%= new CommandVdDelete(hsrw.getParameter("vd"),false).executeWeb() %> <% root.doFlushState(); diff --git a/tools/control/web/tmpl/vd-vdrr.tmpl b/tools/control/web/tmpl/vd-vdrr.tmpl index bca0dccf87..c7f56896e7 100644 --- a/tools/control/web/tmpl/vd-vdrr.tmpl +++ b/tools/control/web/tmpl/vd-vdrr.tmpl @@ -56,7 +56,7 @@ Error: expiry time not specified.
for (int i = 0; i < vds.length; i++) { %> -vd = <%= new CommandVdRefresh(vds[i], new Date(expiry)).execute() %>
+vd = <%= new CommandVdRefresh(vds[i], new Date(expiry)).executeWeb() %>
<% } } diff --git a/tools/control/web/tmpl/vdmenu.tmpl b/tools/control/web/tmpl/vdmenu.tmpl index 20cb5ecf6f..0d0f82219d 100644 --- a/tools/control/web/tmpl/vdmenu.tmpl +++ b/tools/control/web/tmpl/vdmenu.tmpl @@ -45,12 +45,6 @@ Create - - Delete - - - Flush - -- 2.30.2